Avoid potential name collision as suggested by @cantino
Akinori MUSHA
1 changed files with 7 additions and 9 deletions
+ 7
- 9
app/concerns/dry_runnable.rb
@@ -5,10 +5,14 @@ module DryRunnable |
||
| 5 | 5 |
@dry_run = true |
| 6 | 6 |
|
| 7 | 7 |
log = StringIO.new |
| 8 |
- @started_at = Time.zone.now |
|
| 8 |
+ @dry_run_started_at = Time.zone.now |
|
| 9 | 9 |
@dry_run_logger = Logger.new(log).tap { |logger|
|
| 10 | 10 |
logger.formatter = proc { |severity, datetime, progname, message|
|
| 11 |
- "[#{elapsed_time(datetime)}] #{severity} -- #{progname}: #{message}\n"
|
|
| 11 |
+ elapsed_time = '%02d:%02d:%02d' % 2.times.inject([datetime - @dry_run_started_at]) { |(x, *xs)|
|
|
| 12 |
+ [*x.divmod(60), *xs] |
|
| 13 |
+ } |
|
| 14 |
+ |
|
| 15 |
+ "[#{elapsed_time}] #{severity} -- #{progname}: #{message}\n"
|
|
| 12 | 16 |
} |
| 13 | 17 |
} |
| 14 | 18 |
@dry_run_results = {
|
@@ -18,7 +22,7 @@ module DryRunnable |
||
| 18 | 22 |
begin |
| 19 | 23 |
raise "#{short_type} does not support dry-run" unless can_dry_run?
|
| 20 | 24 |
readonly! |
| 21 |
- @started_at = Time.zone.now |
|
| 25 |
+ @dry_run_started_at = Time.zone.now |
|
| 22 | 26 |
@dry_run_logger.info('Dry Run started')
|
| 23 | 27 |
if event |
| 24 | 28 |
raise "This agent cannot receive an event!" unless can_receive_events? |
@@ -44,12 +48,6 @@ module DryRunnable |
||
| 44 | 48 |
!!@dry_run |
| 45 | 49 |
end |
| 46 | 50 |
|
| 47 |
- def elapsed_time(datetime) |
|
| 48 |
- '%02d:%02d:%02d' % 2.times.inject([datetime - @started_at]) { |(x, *xs)|
|
|
| 49 |
- [*x.divmod(60), *xs] |
|
| 50 |
- } |
|
| 51 |
- end |
|
| 52 |
- |
|
| 53 | 51 |
included do |
| 54 | 52 |
prepend Wrapper |
| 55 | 53 |
end |